From ba7feed1c1bc25e4cfd9c8872b324b11f1f845b3 Mon Sep 17 00:00:00 2001
From: Robert Lipe <robertlipe@gpsbabel.org>
Date: Sun, 26 Nov 2017 22:42:16 -0600
Subject: [PATCH] More header sorting.

---
 filter_vecs.cc  | 2 +-
 g7towin.cc      | 2 +-
 garmin_tables.h | 2 +-
 lowranceusr.cc  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/filter_vecs.cc b/filter_vecs.cc
index 4153efae1..f4568f000 100644
--- a/filter_vecs.cc
+++ b/filter_vecs.cc
@@ -24,8 +24,8 @@
 #include "gbversion.h"
 #include "inifile.h"
 #include <QtCore/QStringList>
-#include <cstdlib>
 #include <cstdio>
+#include <cstdlib>
 #include <cstdlib> // qsort
 
 typedef struct {
diff --git a/g7towin.cc b/g7towin.cc
index 72bf9b351..ae673c88a 100644
--- a/g7towin.cc
+++ b/g7towin.cc
@@ -34,7 +34,7 @@
 
 #include <cstdlib>
 #include <ctime>
-#include <stdio.h>
+#include <cstdio>
 
 #if CSVFMTS_ENABLED
 
diff --git a/garmin_tables.h b/garmin_tables.h
index 8f2b13b9f..21e7e0862 100644
--- a/garmin_tables.h
+++ b/garmin_tables.h
@@ -28,7 +28,7 @@
 #define DEFAULT_ICON_DESCR "Waypoint"
 #define DEFAULT_ICON_VALUE 18
 
-typedef struct icon_mapping {
+typedef const struct icon_mapping {
   const int mpssymnum;
   const int pcxsymnum;
   const char* icon;
diff --git a/lowranceusr.cc b/lowranceusr.cc
index a1087c795..610c6f737 100644
--- a/lowranceusr.cc
+++ b/lowranceusr.cc
@@ -35,8 +35,8 @@
 #include "defs.h"
 #include <QtCore/QDebug>
 #include <cmath> /* for lat/lon conversion */
+#include <cstdio>
 #include <cstdlib> // atoi
-#include <stdio.h>
 
 typedef struct lowranceusr_icon_mapping {
   const int	value;
-- 
2.30.2